]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
messageTray: Don't animate the desktop clone for a failed tray grab
authorJasper St. Pierre <jstpierre@mecheye.net>
Tue, 2 Oct 2012 23:24:56 +0000 (20:24 -0300)
committerJasper St. Pierre <jstpierre@mecheye.net>
Thu, 4 Oct 2012 07:02:16 +0000 (04:02 -0300)
If we fail to grab for the message tray, we shouldn't be animating
the desktop clone. This is a regression from commit fe124e6.

https://bugzilla.gnome.org/show_bug.cgi?id=685342

js/ui/messageTray.js

index 9baaaeacbeceac5f8ae776bb04c18d5e32fca291..8b27d3d0e0f45e873c0c57b13110d721df16c6d0 100644 (file)
@@ -2028,7 +2028,7 @@ const MessageTray = new Lang.Class({
         let trayShouldBeVisible = (this._summaryState == State.SHOWING ||
                                    this._summaryState == State.SHOWN);
         if (!trayIsVisible && trayShouldBeVisible)
-            this._showTray();
+            trayShouldBeVisible = this._showTray();
         else if (trayIsVisible && !trayShouldBeVisible)
             this._hideTray();
 
@@ -2078,7 +2078,7 @@ const MessageTray = new Lang.Class({
                                      modal: modal,
                                      onUngrab: Lang.bind(this, this._escapeTray) })) {
             this._traySummoned = false;
-            return;
+            return false;
         }
 
         this._tween(this.actor, '_trayState', State.SHOWN,
@@ -2090,6 +2090,8 @@ const MessageTray = new Lang.Class({
         if (this._overviewVisible) {
             this._lightbox.show();
         }
+
+        return true;
     },
 
     _showDesktopClone: function() {